From fa7816d99c70a759d67ddc09bc2cadf7cf2a29dd Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sat, 19 Dec 2015 08:09:06 +0100
Subject: [PATCH] dnd: When setting a dnd icon widget, unset old one

Setting a DND icon twice should actually work and not cause warnings the
2nd time.
---
 gtk/gtkdnd.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 0907fd9116..c4fd666c35 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -2485,6 +2485,8 @@ gtk_drag_set_icon_widget_internal (GdkDragContext *context,
       gtk_widget_show (widget);
     }
 
+  if (gtk_bin_get_child (GTK_BIN (info->icon_window)))
+    gtk_container_remove (GTK_CONTAINER (info->icon_window), gtk_bin_get_child (GTK_BIN (info->icon_window)));
   gtk_container_add (GTK_CONTAINER (info->icon_window), widget);
 
 out:
-- 
2.30.2